Od fixes-- rick's branch rebased on current master [632f6e1] #39
Conversation
The standard PluginInstall has a nasty bug which uses the source
path as part of installation path. Remove, and use a simple
OpenCPN.app prefix
The loader expects the apple tarball to have paths like:
- OpenCPN.app/Contents/PlugIns: .dylib plugin file, binaries
and helper libs.
- OpenCPN.app/Contents/Resources: .lproj gettext translations
directories.
The prefix is discarded and could be anything.
Let "make package" build both the traditional installer and the
new installation tarball. Remove references to other formats,
notably rpm.
Some places including bintray uses a common namespace for all plugins. Make sure the plugin filename is unique by including both source and target name and version.
We are using deprecated and finally failing stuff. See: OpenCPN/OpenCPN#1452
Updating the key is error-prone and requires the secret key. It also requires the travis command line utility. Using that and the key I was finally able to update .travis.yml using travis encrypt -x -a deploy.key -r leamas/squiddio_pi <my key> -x: Overwrite existing key -r: Name of repo Note that the repo is part of the key so after forking a new, encrypted key must be generated.
The travis bintray integration seems just unstable. Use a raw access to the REST API in a shellscript instead.
... and move tarball location to cloudsmith
Installable plugin generation
plugin.xml.in: Fix copy-paste error.
comment out Line 45 make create-dmgg
The ci/control file could and should be updated to work with all Ubuntu versions applicable. Leaving it in place, to be overwritten in build process.
in other words, I should not merge the pull request with my master? What exactly am I expected to do? Sorry I jumped into this a little late so I need some handholding lest I cause everyone more work (including myself)
All the changes I made in the last 3-4 days were about .travis.yml and appveyor.yml, so if the ones in the PR are functional (other than substituting my own creds for the 2 services), no big loss. Let's call it a learning opportunity for me |
You are the upstream maintainer here, so in the end it's your call. That said, I am providing this as some help to Rick who seems to have a hard time rebasing his changes on the new tip. Sorry for using your repo as message service, but I see no other way to achieve this. So, for now I suggest that you just let this PR sit here, waiting for Rick to come up with the real stuff. |
|
Leamas, |
|
Alec, If that is true, that leaves |
|
So, I definitely don't want to rebase this once again. Closing |
|
FACT: Alec, you never rebased! You erased history and reverted Mauro's repository back to your original commit, and then created a new commit using your original commit. No rebase needed. ---Yes, you did rebase for this PR that was not used. |
PLEASE DON*T MERGE THIS BRANCH (sorry for shouting)
This is Rick's branch od-fixes rebased to current master. I't builds on all platforms. I provide it as some input since the process to rebase #34 has been somewhat painful. Some remarks.
There is old code around for MacOS installations like
INSTALL(TARGETS ${PACKAGE_NAME} RUNTIME LIBRARY DESTINATION ${CMAKE_:BINARY_DIR}/OpenCPN.app/Contents/PlugIns). This is utterly broken, the ${CMAKE_BINARY_DIR} prefix uses build host paths as installation paths. Just drop the prefix to fix.The plugin artifact names are something like squiddio-pi-0.6.4_debian-10.whatever. Alll these parts are required so that for example the same plugin built for Debian 9 and Debain 10 can co-exist in the same directory. Adding new parts to the name is fine, but please don't remove anything.
This is a a rough git rebase -X ours so some changes made by @mauroc are certainly lost.
EDIT: The bintray deployment in appveyor.yml is dead code, I missed to remove it. Sorry...
HTH... /alec